From b90e35d94a1b2bbc1864b02805adfb521a8837bd Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 30 Mar 2005 11:04:51 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.161 (424a87d38l7A3H0bMHl_fsQl_ZRvuA) Remove vmassist dom0_op. Can now adjust vm assists via setdomaininfo. Signed-off-by: Keir Fraser --- tools/libxc/xc.h | 5 ----- tools/libxc/xc_domain.c | 13 ------------- xen/common/dom0_ops.c | 15 --------------- xen/include/public/dom0_ops.h | 10 ---------- 4 files changed, 43 deletions(-) diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h index 091c9d01e8..77081f329a 100644 --- a/tools/libxc/xc.h +++ b/tools/libxc/xc.h @@ -375,11 +375,6 @@ int xc_domain_setmaxmem(int xc_handle, u32 domid, unsigned int max_memkb); -int xc_domain_setvmassist(int xc_handle, - u32 domid, - unsigned int cmd, - unsigned int type); - typedef dom0_perfc_desc_t xc_perfc_desc_t; /* IMPORTANT: The caller is responsible for mlock()'ing the @desc array. */ int xc_perfc_control(int xc_handle, diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 7104ea1a48..d907a699e0 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -243,16 +243,3 @@ int xc_domain_setmaxmem(int xc_handle, op.u.setdomainmaxmem.max_memkb = max_memkb; return do_dom0_op(xc_handle, &op); } - -int xc_domain_setvmassist(int xc_handle, - u32 domid, - unsigned int cmd, - unsigned int type) -{ - dom0_op_t op; - op.cmd = DOM0_SETDOMAINVMASSIST; - op.u.setdomainvmassist.domain = (domid_t)domid; - op.u.setdomainvmassist.cmd = cmd; - op.u.setdomainvmassist.type = type; - return do_dom0_op(xc_handle, &op); -} diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index 2c9880d53d..6ce1abe633 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -451,21 +451,6 @@ long do_dom0_op(dom0_op_t *u_dom0_op) } break; - case DOM0_SETDOMAINVMASSIST: - { - struct domain *d; - ret = -ESRCH; - d = find_domain_by_id( op->u.setdomainvmassist.domain ); - if ( d != NULL ) - { - vm_assist(d, op->u.setdomainvmassist.cmd, - op->u.setdomainvmassist.type); - put_domain(d); - ret = 0; - } - } - break; - #ifdef PERF_COUNTERS case DOM0_PERFCCONTROL: { diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h index 979b083b55..070182a6db 100644 --- a/xen/include/public/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -320,15 +320,6 @@ typedef struct { MEMORY_PADDING; } PACKED dom0_getpageframeinfo2_t; /* 24 bytes */ -#define DOM0_SETDOMAINVMASSIST 30 -typedef struct { - /* IN variables. */ - domid_t domain; /* 0 */ - u16 __pad0; - u32 cmd; /* 4: vm_assist cmd */ - u32 type; /* 8: vm_assist cmd */ -} PACKED dom0_setdomainvmassist_t; /* 12 bytes */ - /* * Request memory range (@pfn, @pfn+@nr_pfns-1) to have type @type. * On x86, @type is an architecture-defined MTRR memory type. @@ -443,7 +434,6 @@ typedef struct { dom0_setdomaininitialmem_t setdomaininitialmem; dom0_setdomainmaxmem_t setdomainmaxmem; dom0_getpageframeinfo2_t getpageframeinfo2; - dom0_setdomainvmassist_t setdomainvmassist; dom0_add_memtype_t add_memtype; dom0_del_memtype_t del_memtype; dom0_read_memtype_t read_memtype; -- 2.30.2